From ffd517cc3fbeac9b6b8783568f8973640a1ba2c6 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 6 Nov 2015 07:04:14 -0500
Subject: [PATCH] Adwaita: Update scale styling

Use :first-child/:last-child on the trough for determining
which slider we need.
---
 gtk/theme/Adwaita/_common.scss           |  83 ++-
 gtk/theme/Adwaita/gtk-contained-dark.css | 728 ++++++++++-------------
 gtk/theme/Adwaita/gtk-contained.css      | 724 ++++++++++------------
 3 files changed, 690 insertions(+), 845 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index a5060413cc..a1021a78d0 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2142,12 +2142,10 @@ checkbutton.text-button, radiobutton.text-button {
 /************
  * GtkScale *
  ************/
-scale,
-scale.scale-has-marks-above.scale-has-marks-below,
-scale.vertical.scale-has-marks-above.scale-has-marks-below {
+scale {
   // FIXME: rationalize
   -GtkScale-slider-length: 20;
-  -GtkRange-slider-width: 20;
+  -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
   outline-offset: -9px;
   outline-radius: 4px;
@@ -2155,14 +2153,32 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
   &.fine-tune {
     outline-offset: -7px;
     outline-radius: 6px;
-    & trough {
-      margin: 8px;
-      border-radius: 4px;
+    & trough { border-radius: 4px; }
+    & trough:not(:first-child):not(:last-child),
+    & trough:only-child {
+      margin: 10px;
     }
   }
 
-  trough {
-    slider {
+  & trough:not(:first-child):not(:last-child),
+  & trough:only-child {
+    margin: 12px;
+    & slider { margin: 2px 0; }
+  }
+
+  &.vertical trough:not(:first-child):not(:last-child),
+  &.vertical trough:only-child {
+    margin: 12px;
+    & slider { margin: 0 2px; }
+  }
+
+  & trough {
+    border: 1px solid $borders_color;
+    border-radius: 3px;
+    background-color: mix($bg_color, $borders_color, 60%);
+    box-shadow: inset 1px 1px transparentize(black, 0.9),
+                _widget_edge();
+    & slider {
       //FIXME: better gradient on the slider and hover state
       @include button(normal);
       border: 1px solid;
@@ -2212,14 +2228,6 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
         &:backdrop { @include button(osd-backdrop); }
       }
     }
-  }
-  trough {
-    margin: 10px;
-    border: 1px solid $borders_color;
-    border-radius: 3px;
-    background-color: mix($bg_color, $borders_color, 60%);
-    box-shadow: inset 1px 1px transparentize(black, 0.9),
-                _widget_edge();
     &.highlight {
       @include progressbar_fill;
       border-color: $selected_borders_color;
@@ -2294,15 +2302,12 @@ scale marks {
 
 @each $d,$dn in ('', 'horz'),
                 ('.vertical', 'vert') {
-  @each $w,$we in  ('scale-has-marks-below','scale_marks_below'),
-                   ('scale-has-marks-above','scale_marks_above') {
-    scale#{$d}.#{$w} {
-      -GtkScale-slider-length: 20;
-      -GtkRange-slider-width: 24;
-      -GtkRange-trough-border: 2;
-
-      @extend %#{$we}_#{$dn};
-      trough {
+  @each $ws,$w,$we in  (':first-child:not(:last-child)','scale-has-marks-below','scale_marks_below'),
+                       (':not(:first-child):last-child','scale-has-marks-above','scale_marks_above') {
+    scale#{$d} {
+      &.fine-tune trough#{$ws} { @extend %#{$we}_#{$dn}_ft; }
+      & trough#{$ws} {
+        @extend %#{$we}_#{$dn};
 
         @each $s,$as in ('',''),
                         (':hover','-hover'),
@@ -2327,22 +2332,14 @@ scale marks {
   }
 }
 
-%scale_marks_above_horz {
-  trough { margin: 14px 10px 10px; }
-  &.fine-tune trough { margin: 12px 8px 8px; }
-}
-%scale_marks_below_horz {
-  trough { margin: 10px 10px 14px; }
-  &.fine-tune trough { margin: 8px 8px 12px; }
-}
-%scale_marks_above_vert {
-  trough { margin: 10px 10px 10px 14px; }
-  &.fine-tune trough { margin: 8px 8px 8px 12px; }
-}
-%scale_marks_below_vert {
-  trough { margin: 10px 14px 10px 10px; }
-  &.fine-tune trough { margin: 8px 12px 8px 8px; }
-}
+%scale_marks_above_horz { margin: 14px 10px 10px 10px; }
+%scale_marks_below_horz { margin: 10px 10px 14px 10px; }
+%scale_marks_above_vert { margin: 10px 10px 10px 14px; }
+%scale_marks_below_vert { margin: 10px 14px 10px 10px; }
+%scale_marks_above_horz_ft { margin: 12px  8px  8px  8px; }
+%scale_marks_below_horz_ft { margin:  8px  8px 12px  8px; }
+%scale_marks_above_vert_ft { margin:  8px  8px  8px 12px; }
+%scale_marks_below_vert_ft { margin:  8px 12px  8px  8px; }
 
 /*****************
  * Progress bars *
@@ -2875,7 +2872,7 @@ GtkFileChooserDialog {
     background-color: $backdrop_sidebar_bg_color;
   }
 
-  &:selected {
+  :selected {
     @extend %selected_items;
   }
 }
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 4c05253199..b2a806ad39 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -2925,473 +2925,397 @@ checkbutton.text-button, radiobutton.text-button {
 /************
  * GtkScale *
  ************/
-scale,
-scale.scale-has-marks-above.scale-has-marks-below,
-scale.vertical.scale-has-marks-above.scale-has-marks-below {
+scale {
   -GtkScale-slider-length: 20;
-  -GtkRange-slider-width: 20;
+  -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
   outline-offset: -9px;
   outline-radius: 4px; }
-  scale.fine-tune,
-  scale.scale-has-marks-above.scale-has-marks-below.fine-tune,
-  scale.vertical.scale-has-marks-above.scale-has-marks-below.fine-tune {
+  scale.fine-tune {
     outline-offset: -7px;
     outline-radius: 6px; }
-    scale.fine-tune trough,
-    scale.scale-has-marks-above.scale-has-marks-below.fine-tune trough,
-    scale.vertical.scale-has-marks-above.scale-has-marks-below.fine-tune trough {
-      margin: 8px;
+    scale.fine-tune trough {
       border-radius: 4px; }
-  scale trough slider,
-  scale.scale-has-marks-above.scale-has-marks-below trough slider,
-  scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider {
-    color: #eeeeec;
-    outline-color: rgba(238, 238, 236, 0.3);
-    border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #454c4c, #393f3f 40%, #2d3232);
-    text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
-    icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1);
-    border: 1px solid;
-    border-radius: 50%;
-    border-color: #151717;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px #393f3f, inset 0 -1px #2b2f2f; }
-    scale trough slider:hover,
-    scale.scale-has-marks-above.scale-has-marks-below trough slider:hover,
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:hover {
+    scale.fine-tune trough:not(:first-child):not(:last-child), scale.fine-tune trough:only-child {
+      margin: 10px; }
+  scale trough:not(:first-child):not(:last-child), scale trough:only-child {
+    margin: 12px; }
+    scale trough:not(:first-child):not(:last-child) slider, scale trough:only-child slider {
+      margin: 2px 0; }
+  scale.vertical trough:not(:first-child):not(:last-child), scale.vertical trough:only-child {
+    margin: 12px; }
+    scale.vertical trough:not(:first-child):not(:last-child) slider, scale.vertical trough:only-child slider {
+      margin: 0 2px; }
+  scale trough {
+    border: 1px solid #1c1f1f;
+    border-radius: 3px;
+    background-color: #2d3232;
+    box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
+    scale trough slider {
       color: #eeeeec;
       outline-color: rgba(238, 238, 236, 0.3);
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #5b6464, #434a4a 40%, #393f3f);
-      text-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
-      icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
+      background-image: linear-gradient(to bottom, #454c4c, #393f3f 40%, #2d3232);
+      text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
+      icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1);
-      border-color: #151717;
-      border-radius: 50%;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(255, 255, 255, 0.14), inset 0 -1px #303535; }
-    scale trough slider:insensitive,
-    scale.scale-has-marks-above.scale-has-marks-below trough slider:insensitive,
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:insensitive {
-      border-style: solid;
-      border-radius: 50%;
-      background-image: linear-gradient(to bottom, #333636);
-      box-shadow: none; }
-    scale trough slider:backdrop,
-    scale.scale-has-marks-above.scale-has-marks-below trough slider:backdrop,
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop {
-      border-style: solid;
+      border: 1px solid;
       border-radius: 50%;
-      border-color: #181a1a;
-      background-image: linear-gradient(to bottom, #393f3f);
-      box-shadow: none; }
-    scale trough slider:backdrop:insensitive,
-    scale.scale-has-marks-above.scale-has-marks-below trough slider:backdrop:insensitive,
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop:insensitive {
-      color: #5d6767;
-      border-color: #1f2222;
-      background-image: linear-gradient(to bottom, #333636);
-      text-shadow: none;
-      icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      scale trough slider:backdrop:insensitive > .label,
-      scale.scale-has-marks-above.scale-has-marks-below trough slider:backdrop:insensitive > .label,
-      scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop:insensitive > .label {
-        color: inherit; }
-    scale trough slider:active,
-    scale.scale-has-marks-above.scale-has-marks-below trough slider:active,
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:active {
-      color: #eeeeec;
-      outline-color: rgba(238, 238, 236, 0.3);
-      border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #232727, #292d2d 40%, #2d3232);
-      text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
-      icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
-      box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0.1);
-      border: 1px solid #14375d; }
-    .osd scale trough slider, .osd
-    scale.scale-has-marks-above.scale-has-marks-below trough slider, .osd
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider {
-      color: #eeeeec;
-      border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
-      background-clip: padding-box;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
-      text-shadow: 0 1px black;
-      icon-shadow: 0 1px black;
-      outline-color: rgba(238, 238, 236, 0.3);
-      background-color: #202526; }
-      .osd scale trough slider:hover, .osd
-      scale.scale-has-marks-above.scale-has-marks-below trough slider:hover, .osd
-      scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:hover {
-        color: white;
-        border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
-        background-clip: padding-box;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
-        text-shadow: 0 1px black;
-        icon-shadow: 0 1px black;
-        outline-color: rgba(238, 238, 236, 0.3); }
-      .osd scale trough slider:active, .osd
-      scale.scale-has-marks-above.scale-has-marks-below trough slider:active, .osd
-      scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:active {
-        color: white;
-        border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
-        background-clip: padding-box;
-        box-shadow: none;
+      border-color: #151717;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px #393f3f, inset 0 -1px #2b2f2f; }
+      scale trough slider:hover {
+        color: #eeeeec;
+        outline-color: rgba(238, 238, 236, 0.3);
+        border-color: #1c1f1f;
+        background-image: linear-gradient(to bottom, #5b6464, #434a4a 40%, #393f3f);
+        text-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
+        icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1);
+        border-color: #151717;
+        border-radius: 50%;
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(255, 255, 255, 0.14), inset 0 -1px #303535; }
+      scale trough slider:insensitive {
+        border-style: solid;
+        border-radius: 50%;
+        background-image: linear-gradient(to bottom, #333636);
+        box-shadow: none; }
+      scale trough slider:backdrop {
+        border-style: solid;
+        border-radius: 50%;
+        border-color: #181a1a;
+        background-image: linear-gradient(to bottom, #393f3f);
+        box-shadow: none; }
+      scale trough slider:backdrop:insensitive {
+        color: #5d6767;
+        border-color: #1f2222;
+        background-image: linear-gradient(to bottom, #333636);
         text-shadow: none;
         icon-shadow: none;
-        outline-color: rgba(238, 238, 236, 0.3); }
-      .osd scale trough slider:backdrop, .osd
-      scale.scale-has-marks-above.scale-has-marks-below trough slider:backdrop, .osd
-      scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop {
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
+        scale trough slider:backdrop:insensitive > .label {
+          color: inherit; }
+      scale trough slider:active {
+        color: #eeeeec;
+        outline-color: rgba(238, 238, 236, 0.3);
+        border-color: #1c1f1f;
+        background-image: linear-gradient(to bottom, #232727, #292d2d 40%, #2d3232);
+        text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
+        icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
+        box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0.1);
+        border: 1px solid #14375d; }
+      .osd scale trough slider {
         color: #eeeeec;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
         background-clip: padding-box;
-        box-shadow: none;
-        text-shadow: none;
-        icon-shadow: none; }
-  scale trough,
-  scale.scale-has-marks-above.scale-has-marks-below trough,
-  scale.vertical.scale-has-marks-above.scale-has-marks-below trough {
-    margin: 10px;
-    border: 1px solid #1c1f1f;
-    border-radius: 3px;
-    background-color: #2d3232;
-    box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
-    scale trough.highlight,
-    scale.scale-has-marks-above.scale-has-marks-below trough.highlight,
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough.highlight {
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+        text-shadow: 0 1px black;
+        icon-shadow: 0 1px black;
+        outline-color: rgba(238, 238, 236, 0.3);
+        background-color: #202526; }
+        .osd scale trough slider:hover {
+          color: white;
+          border-color: rgba(0, 0, 0, 0.7);
+          background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
+          background-clip: padding-box;
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+          text-shadow: 0 1px black;
+          icon-shadow: 0 1px black;
+          outline-color: rgba(238, 238, 236, 0.3); }
+        .osd scale trough slider:active {
+          color: white;
+          border-color: rgba(0, 0, 0, 0.7);
+          background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+          background-clip: padding-box;
+          box-shadow: none;
+          text-shadow: none;
+          icon-shadow: none;
+          outline-color: rgba(238, 238, 236, 0.3); }
+        .osd scale trough slider:backdrop {
+          color: #eeeeec;
+          border-color: rgba(0, 0, 0, 0.7);
+          background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
+          background-clip: padding-box;
+          box-shadow: none;
+          text-shadow: none;
+          icon-shadow: none; }
+    scale trough.highlight {
       background-image: linear-gradient(to bottom, #215d9c 2px, #266cb5);
       border-color: #0f2b48;
       box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
-      scale trough.highlight.vertical,
-      scale.scale-has-marks-above.scale-has-marks-below trough.highlight.vertical,
-      scale.vertical.scale-has-marks-above.scale-has-marks-below trough.highlight.vertical {
+      scale trough.highlight.vertical {
         background-image: linear-gradient(to right, #215d9c 2px, #266cb5); }
-      scale trough.highlight:backdrop,
-      scale.scale-has-marks-above.scale-has-marks-below trough.highlight:backdrop,
-      scale.vertical.scale-has-marks-above.scale-has-marks-below trough.highlight:backdrop {
+      scale trough.highlight:backdrop {
         border-color: #0f2b48;
         background-color: #215d9c;
         box-shadow: none; }
-    scale trough:insensitive, scale trough.vertical:insensitive,
-    scale.scale-has-marks-above.scale-has-marks-below trough:insensitive,
-    scale.scale-has-marks-above.scale-has-marks-below trough.vertical:insensitive,
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough:insensitive,
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough.vertical:insensitive {
+    scale trough:insensitive, scale trough.vertical:insensitive {
       border-color: #1c1f1f;
       background-image: none;
       background-color: #333636;
       box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
-    scale trough:backdrop,
-    scale.scale-has-marks-above.scale-has-marks-below trough:backdrop,
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop {
+    scale trough:backdrop {
       border-color: #1f2222;
       background-color: #2b2f2f;
       box-shadow: none; }
-    scale trough:backdrop:insensitive, scale trough .highlight:backdrop:insensitive,
-    scale.scale-has-marks-above.scale-has-marks-below trough:backdrop:insensitive,
-    scale.scale-has-marks-above.scale-has-marks-below trough .highlight:backdrop:insensitive,
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop:insensitive,
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough .highlight:backdrop:insensitive {
+    scale trough:backdrop:insensitive, scale trough .highlight:backdrop:insensitive {
       border-color: #1f2222;
       background-color: #333636; }
-    .osd scale trough, .osd
-    scale.scale-has-marks-above.scale-has-marks-below trough, .osd
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough {
+    .osd scale trough {
       border-color: rgba(0, 0, 0, 0.7);
       box-shadow: none;
       margin: 9px;
       background-color: rgba(0, 0, 0, 0.5);
       outline-color: rgba(238, 238, 236, 0.2);
       outline-offset: -8px; }
-      .osd scale trough.fine-tune, .osd
-      scale.scale-has-marks-above.scale-has-marks-below trough.fine-tune, .osd
-      scale.vertical.scale-has-marks-above.scale-has-marks-below trough.fine-tune {
+      .osd scale trough.fine-tune {
         margin: 7px; }
-      .osd scale trough.highlight, .osd
-      scale.scale-has-marks-above.scale-has-marks-below trough.highlight, .osd
-      scale.vertical.scale-has-marks-above.scale-has-marks-below trough.highlight {
+      .osd scale trough.highlight {
         background-image: none;
         background-color: #215d9c; }
-      .osd scale trough:insensitive, .osd scale trough:backdrop:insensitive, .osd
-      scale.scale-has-marks-above.scale-has-marks-below trough:insensitive, .osd
-      scale.scale-has-marks-above.scale-has-marks-below trough:backdrop:insensitive, .osd
-      scale.vertical.scale-has-marks-above.scale-has-marks-below trough:insensitive, .osd
-      scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop:insensitive {
+      .osd scale trough:insensitive, .osd scale trough:backdrop:insensitive {
         border-color: transparent;
         background-color: transparent; }
-      .osd scale trough:backdrop, .osd
-      scale.scale-has-marks-above.scale-has-marks-below trough:backdrop, .osd
-      scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop {
+      .osd scale trough:backdrop {
         border-color: rgba(0, 0, 0, 0.7);
         background-image: none; }
-  row:selected scale, row:selected
-  scale.scale-has-marks-above.scale-has-marks-below, row:selected
-  scale.vertical.scale-has-marks-above.scale-has-marks-below {
+  row:selected scale {
     border-color: #0f2b48;
     box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
-    row:selected scale:backdrop, row:selected
-    scale.scale-has-marks-above.scale-has-marks-below:backdrop, row:selected
-    scale.vertical.scale-has-marks-above.scale-has-marks-below:backdrop {
+    row:selected scale:backdrop {
       box-shadow: none; }
-    row:selected scale.highlight:backdrop, row:selected
-    scale.scale-has-marks-above.scale-has-marks-below.highlight:backdrop, row:selected
-    scale.vertical.scale-has-marks-above.scale-has-marks-below.highlight:backdrop {
+    row:selected scale.highlight:backdrop {
       border-color: #0f2b48; }
-    row:selected scale:insensitive, row:selected scale.highlight:insensitive, row:selected
-    scale.scale-has-marks-above.scale-has-marks-below:insensitive, row:selected
-    scale.scale-has-marks-above.scale-has-marks-below.highlight:insensitive, row:selected
-    scale.vertical.scale-has-marks-above.scale-has-marks-below:insensitive, row:selected
-    scale.vertical.scale-has-marks-above.scale-has-marks-below.highlight:insensitive {
+    row:selected scale:insensitive, row:selected scale.highlight:insensitive {
       border-color: #215d9c;
       box-shadow: none;
       background-color: #90aece;
       background-image: none; }
-      row:selected scale:insensitive:backdrop, row:selected scale.highlight:insensitive:backdrop, row:selected
-      scale.scale-has-marks-above.scale-has-marks-below:insensitive:backdrop, row:selected
-      scale.scale-has-marks-above.scale-has-marks-below.highlight:insensitive:backdrop, row:selected
-      scale.vertical.scale-has-marks-above.scale-has-marks-below:insensitive:backdrop, row:selected
-      scale.vertical.scale-has-marks-above.scale-has-marks-below.highlight:insensitive:backdrop {
+      row:selected scale:insensitive:backdrop, row:selected scale.highlight:insensitive:backdrop {
         background-color: #90aece; }
 
 scale marks {
   color: alpha(currentColor,0.5); }
 
-scale.scale-has-marks-below {
-  -GtkScale-slider-length: 20;
-  -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2; }
-  scale.scale-has-marks-below trough slider {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-dark.png"), url("assets/slider-horz-scale-has-marks-below-dark@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.scale-has-marks-below trough slider:hover {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover-dark.png"), url("assets/slider-horz-scale-has-marks-below-hover-dark@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.scale-has-marks-below trough slider:active {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active-dark.png"), url("assets/slider-horz-scale-has-marks-below-active-dark@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.scale-has-marks-below trough slider:insensitive {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.scale-has-marks-below trough slider:backdrop {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.scale-has-marks-below trough slider:backdrop:insensitive {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
+scale trough:first-child:not(:last-child) slider {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-dark.png"), url("assets/slider-horz-scale-has-marks-below-dark@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale trough:first-child:not(:last-child) slider:hover {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover-dark.png"), url("assets/slider-horz-scale-has-marks-below-hover-dark@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale trough:first-child:not(:last-child) slider:active {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active-dark.png"), url("assets/slider-horz-scale-has-marks-below-active-dark@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale trough:first-child:not(:last-child) slider:insensitive {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale trough:first-child:not(:last-child) slider:backdrop {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale trough:first-child:not(:last-child) slider:backdrop:insensitive {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
 
-scale.scale-has-marks-above {
-  -GtkScale-slider-length: 20;
-  -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2; }
-  scale.scale-has-marks-above trough slider {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-dark.png"), url("assets/slider-horz-scale-has-marks-above-dark@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.scale-has-marks-above trough slider:hover {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover-dark.png"), url("assets/slider-horz-scale-has-marks-above-hover-dark@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.scale-has-marks-above trough slider:active {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active-dark.png"), url("assets/slider-horz-scale-has-marks-above-active-dark@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.scale-has-marks-above trough slider:insensitive {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.scale-has-marks-above trough slider:backdrop {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.scale-has-marks-above trough slider:backdrop:insensitive {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
+scale trough:not(:first-child):last-child slider {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-dark.png"), url("assets/slider-horz-scale-has-marks-above-dark@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale trough:not(:first-child):last-child slider:hover {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover-dark.png"), url("assets/slider-horz-scale-has-marks-above-hover-dark@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale trough:not(:first-child):last-child slider:active {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active-dark.png"), url("assets/slider-horz-scale-has-marks-above-active-dark@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale trough:not(:first-child):last-child slider:insensitive {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale trough:not(:first-child):last-child slider:backdrop {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale trough:not(:first-child):last-child slider:backdrop:insensitive {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
 
-scale.vertical.scale-has-marks-below {
-  -GtkScale-slider-length: 20;
-  -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2; }
-  scale.vertical.scale-has-marks-below trough slider {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-dark.png"), url("assets/slider-vert-scale-has-marks-below-dark@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.vertical.scale-has-marks-below trough slider:hover {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover-dark.png"), url("assets/slider-vert-scale-has-marks-below-hover-dark@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.vertical.scale-has-marks-below trough slider:active {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active-dark.png"), url("assets/slider-vert-scale-has-marks-below-active-dark@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.vertical.scale-has-marks-below trough slider:insensitive {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.vertical.scale-has-marks-below trough slider:backdrop {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.vertical.scale-has-marks-below trough slider:backdrop:insensitive {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
+scale.vertical trough:first-child:not(:last-child) slider {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-dark.png"), url("assets/slider-vert-scale-has-marks-below-dark@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale.vertical trough:first-child:not(:last-child) slider:hover {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover-dark.png"), url("assets/slider-vert-scale-has-marks-below-hover-dark@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale.vertical trough:first-child:not(:last-child) slider:active {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active-dark.png"), url("assets/slider-vert-scale-has-marks-below-active-dark@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale.vertical trough:first-child:not(:last-child) slider:insensitive {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale.vertical trough:first-child:not(:last-child) slider:backdrop {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale.vertical trough:first-child:not(:last-child) slider:backdrop:insensitive {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
 
-scale.vertical.scale-has-marks-above {
-  -GtkScale-slider-length: 20;
-  -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2; }
-  scale.vertical.scale-has-marks-above trough slider {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-dark.png"), url("assets/slider-vert-scale-has-marks-above-dark@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.vertical.scale-has-marks-above trough slider:hover {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover-dark.png"), url("assets/slider-vert-scale-has-marks-above-hover-dark@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.vertical.scale-has-marks-above trough slider:active {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active-dark.png"), url("assets/slider-vert-scale-has-marks-above-active-dark@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.vertical.scale-has-marks-above trough slider:insensitive {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.vertical.scale-has-marks-above trough slider:backdrop {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.vertical.scale-has-marks-above trough slider:backdrop:insensitive {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
+scale.vertical trough:not(:first-child):last-child slider {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-dark.png"), url("assets/slider-vert-scale-has-marks-above-dark@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale.vertical trough:not(:first-child):last-child slider:hover {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover-dark.png"), url("assets/slider-vert-scale-has-marks-above-hover-dark@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale.vertical trough:not(:first-child):last-child slider:active {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active-dark.png"), url("assets/slider-vert-scale-has-marks-above-active-dark@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale.vertical trough:not(:first-child):last-child slider:insensitive {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale.vertical trough:not(:first-child):last-child slider:backdrop {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale.vertical trough:not(:first-child):last-child slider:backdrop:insensitive {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
 
-scale.scale-has-marks-above trough {
-  margin: 14px 10px 10px; }
-scale.fine-tune.scale-has-marks-above trough {
-  margin: 12px 8px 8px; }
+scale trough:not(:first-child):last-child {
+  margin: 14px 10px 10px 10px; }
 
-scale.scale-has-marks-below trough {
-  margin: 10px 10px 14px; }
-scale.fine-tune.scale-has-marks-below trough {
-  margin: 8px 8px 12px; }
+scale trough:first-child:not(:last-child) {
+  margin: 10px 10px 14px 10px; }
 
-scale.vertical.scale-has-marks-above trough {
+scale.vertical trough:not(:first-child):last-child {
   margin: 10px 10px 10px 14px; }
-scale.fine-tune.vertical.scale-has-marks-above trough {
-  margin: 8px 8px 8px 12px; }
 
-scale.vertical.scale-has-marks-below trough {
+scale.vertical trough:first-child:not(:last-child) {
   margin: 10px 14px 10px 10px; }
-scale.fine-tune.vertical.scale-has-marks-below trough {
-  margin: 8px 12px 8px 8px; }
+
+scale.fine-tune trough:not(:first-child):last-child {
+  margin: 12px  8px  8px  8px; }
+
+scale.fine-tune trough:first-child:not(:last-child) {
+  margin: 8px  8px 12px  8px; }
+
+scale.vertical.fine-tune trough:not(:first-child):last-child {
+  margin: 8px  8px  8px 12px; }
+
+scale.vertical.fine-tune trough:first-child:not(:last-child) {
+  margin: 8px 12px  8px  8px; }
 
 /*****************
  * Progress bars *
@@ -4534,23 +4458,23 @@ headerbar.selection-mode button.titlebutton,
 textview text:selected,
 .view:selected,
 calendar:selected, label:selected, label:selected:focus, label:selected:hover, .grid-child:selected, entry:selected, spinbutton:selected, entry:selected:focus, spinbutton:selected:focus, modelbutton.flat:selected,
-.menuitem.button.flat:selected, row:selected, .sidebar:selected {
+.menuitem.button.flat:selected, row:selected, .sidebar :selected {
   background-color: #215d9c;
   color: #ffffff; }
   textview text:insensitive:selected,
   .view:insensitive:selected,
   calendar:insensitive:selected, label:insensitive:selected, .grid-child:insensitive:selected, entry:insensitive:selected, spinbutton:insensitive:selected, modelbutton.flat:insensitive:selected,
-  .menuitem.button.flat:insensitive:selected, row:insensitive:selected, .sidebar:insensitive:selected, placessidebar row:selected:insensitive label {
+  .menuitem.button.flat:insensitive:selected, row:insensitive:selected, .sidebar :insensitive:selected, placessidebar row:selected:insensitive label {
     color: #90aece; }
   textview text:backdrop:selected,
   .view:backdrop:selected,
   calendar:backdrop:selected, label:backdrop:selected, .grid-child:backdrop:selected, entry:backdrop:selected, spinbutton:backdrop:selected, modelbutton.flat:backdrop:selected,
-  .menuitem.button.flat:backdrop:selected, row:backdrop:selected, .sidebar:backdrop:selected {
+  .menuitem.button.flat:backdrop:selected, row:backdrop:selected, .sidebar :backdrop:selected {
     color: #ffffff; }
     textview text:backdrop:insensitive:selected,
     .view:backdrop:insensitive:selected,
     calendar:backdrop:insensitive:selected, label:backdrop:insensitive:selected, .grid-child:backdrop:insensitive:selected, entry:backdrop:insensitive:selected, spinbutton:backdrop:insensitive:selected, modelbutton.flat:backdrop:insensitive:selected,
-    .menuitem.button.flat:backdrop:insensitive:selected, row:backdrop:insensitive:selected, .sidebar:backdrop:insensitive:selected, placessidebar row:selected:insensitive label:backdrop, placessidebar row:selected:backdrop:insensitive label {
+    .menuitem.button.flat:backdrop:insensitive:selected, row:backdrop:insensitive:selected, .sidebar :backdrop:insensitive:selected, placessidebar row:selected:insensitive label:backdrop, placessidebar row:selected:backdrop:insensitive label {
       color: #648eba; }
 
 .monospace {
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 71d25209d4..bcd267752f 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -3087,473 +3087,397 @@ checkbutton.text-button, radiobutton.text-button {
 /************
  * GtkScale *
  ************/
-scale,
-scale.scale-has-marks-above.scale-has-marks-below,
-scale.vertical.scale-has-marks-above.scale-has-marks-below {
+scale {
   -GtkScale-slider-length: 20;
-  -GtkRange-slider-width: 20;
+  -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
   outline-offset: -9px;
   outline-radius: 4px; }
-  scale.fine-tune,
-  scale.scale-has-marks-above.scale-has-marks-below.fine-tune,
-  scale.vertical.scale-has-marks-above.scale-has-marks-below.fine-tune {
+  scale.fine-tune {
     outline-offset: -7px;
     outline-radius: 6px; }
-    scale.fine-tune trough,
-    scale.scale-has-marks-above.scale-has-marks-below.fine-tune trough,
-    scale.vertical.scale-has-marks-above.scale-has-marks-below.fine-tune trough {
-      margin: 8px;
+    scale.fine-tune trough {
       border-radius: 4px; }
-  scale trough slider,
-  scale.scale-has-marks-above.scale-has-marks-below trough slider,
-  scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider {
-    color: #2e3436;
-    outline-color: rgba(46, 52, 54, 0.3);
-    border-color: #a1a1a1;
-    background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0);
-    text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-    icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-    box-shadow: inset 0 1px white, 0 1px white;
-    border: 1px solid;
-    border-radius: 50%;
-    border-color: #999999;
-    box-shadow: inset 0 1px white, inset 0 -2px #ededed, inset 0 -1px #c7c7c7; }
-    scale trough slider:hover,
-    scale.scale-has-marks-above.scale-has-marks-below trough slider:hover,
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:hover {
+    scale.fine-tune trough:not(:first-child):not(:last-child), scale.fine-tune trough:only-child {
+      margin: 10px; }
+  scale trough:not(:first-child):not(:last-child), scale trough:only-child {
+    margin: 12px; }
+    scale trough:not(:first-child):not(:last-child) slider, scale trough:only-child slider {
+      margin: 2px 0; }
+  scale.vertical trough:not(:first-child):not(:last-child), scale.vertical trough:only-child {
+    margin: 12px; }
+    scale.vertical trough:not(:first-child):not(:last-child) slider, scale.vertical trough:only-child slider {
+      margin: 0 2px; }
+  scale trough {
+    border: 1px solid #a1a1a1;
+    border-radius: 3px;
+    background-color: #cfcfcf;
+    box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px white; }
+    scale trough slider {
       color: #2e3436;
       outline-color: rgba(46, 52, 54, 0.3);
       border-color: #a1a1a1;
-      background-image: linear-gradient(to bottom, white, #f7f7f7 40%, #ededed);
+      background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0);
       text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
       icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
       box-shadow: inset 0 1px white, 0 1px white;
-      border-color: #999999;
-      border-radius: 50%;
-      box-shadow: inset 0 1px white, inset 0 -2px white, inset 0 -1px #d6d6d6; }
-    scale trough slider:insensitive,
-    scale.scale-has-marks-above.scale-has-marks-below trough slider:insensitive,
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:insensitive {
-      border-style: solid;
-      border-radius: 50%;
-      background-image: linear-gradient(to bottom, #f4f4f4);
-      box-shadow: none; }
-    scale trough slider:backdrop,
-    scale.scale-has-marks-above.scale-has-marks-below trough slider:backdrop,
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop {
-      border-style: solid;
+      border: 1px solid;
       border-radius: 50%;
-      border-color: #a1a1a1;
-      background-image: linear-gradient(to bottom, #ededed);
-      box-shadow: none; }
-    scale trough slider:backdrop:insensitive,
-    scale.scale-has-marks-above.scale-has-marks-below trough slider:backdrop:insensitive,
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop:insensitive {
-      color: #c7c7c7;
-      border-color: darkgray;
-      background-image: linear-gradient(to bottom, #f4f4f4);
-      text-shadow: none;
-      icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      scale trough slider:backdrop:insensitive > .label,
-      scale.scale-has-marks-above.scale-has-marks-below trough slider:backdrop:insensitive > .label,
-      scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop:insensitive > .label {
-        color: inherit; }
-    scale trough slider:active,
-    scale.scale-has-marks-above.scale-has-marks-below trough slider:active,
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:active {
-      color: #2e3436;
-      outline-color: rgba(46, 52, 54, 0.3);
-      border-color: #a1a1a1;
-      background-image: linear-gradient(to bottom, #d6d6d6, gainsboro 40%, #e0e0e0);
-      text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-      icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-      box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white;
-      border: 1px solid #153d65; }
-    .osd scale trough slider, .osd
-    scale.scale-has-marks-above.scale-has-marks-below trough slider, .osd
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider {
-      color: #eeeeec;
-      border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
-      background-clip: padding-box;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
-      text-shadow: 0 1px black;
-      icon-shadow: 0 1px black;
-      outline-color: rgba(238, 238, 236, 0.3);
-      background-color: #202526; }
-      .osd scale trough slider:hover, .osd
-      scale.scale-has-marks-above.scale-has-marks-below trough slider:hover, .osd
-      scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:hover {
-        color: white;
-        border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
-        background-clip: padding-box;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
-        text-shadow: 0 1px black;
-        icon-shadow: 0 1px black;
-        outline-color: rgba(238, 238, 236, 0.3); }
-      .osd scale trough slider:active, .osd
-      scale.scale-has-marks-above.scale-has-marks-below trough slider:active, .osd
-      scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:active {
-        color: white;
-        border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
-        background-clip: padding-box;
-        box-shadow: none;
+      border-color: #999999;
+      box-shadow: inset 0 1px white, inset 0 -2px #ededed, inset 0 -1px #c7c7c7; }
+      scale trough slider:hover {
+        color: #2e3436;
+        outline-color: rgba(46, 52, 54, 0.3);
+        border-color: #a1a1a1;
+        background-image: linear-gradient(to bottom, white, #f7f7f7 40%, #ededed);
+        text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
+        icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
+        box-shadow: inset 0 1px white, 0 1px white;
+        border-color: #999999;
+        border-radius: 50%;
+        box-shadow: inset 0 1px white, inset 0 -2px white, inset 0 -1px #d6d6d6; }
+      scale trough slider:insensitive {
+        border-style: solid;
+        border-radius: 50%;
+        background-image: linear-gradient(to bottom, #f4f4f4);
+        box-shadow: none; }
+      scale trough slider:backdrop {
+        border-style: solid;
+        border-radius: 50%;
+        border-color: #a1a1a1;
+        background-image: linear-gradient(to bottom, #ededed);
+        box-shadow: none; }
+      scale trough slider:backdrop:insensitive {
+        color: #c7c7c7;
+        border-color: darkgray;
+        background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         icon-shadow: none;
-        outline-color: rgba(238, 238, 236, 0.3); }
-      .osd scale trough slider:backdrop, .osd
-      scale.scale-has-marks-above.scale-has-marks-below trough slider:backdrop, .osd
-      scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop {
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+        scale trough slider:backdrop:insensitive > .label {
+          color: inherit; }
+      scale trough slider:active {
+        color: #2e3436;
+        outline-color: rgba(46, 52, 54, 0.3);
+        border-color: #a1a1a1;
+        background-image: linear-gradient(to bottom, #d6d6d6, gainsboro 40%, #e0e0e0);
+        text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
+        icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
+        box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white;
+        border: 1px solid #153d65; }
+      .osd scale trough slider {
         color: #eeeeec;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
         background-clip: padding-box;
-        box-shadow: none;
-        text-shadow: none;
-        icon-shadow: none; }
-  scale trough,
-  scale.scale-has-marks-above.scale-has-marks-below trough,
-  scale.vertical.scale-has-marks-above.scale-has-marks-below trough {
-    margin: 10px;
-    border: 1px solid #a1a1a1;
-    border-radius: 3px;
-    background-color: #cfcfcf;
-    box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px white; }
-    scale trough.highlight,
-    scale.scale-has-marks-above.scale-has-marks-below trough.highlight,
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough.highlight {
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+        text-shadow: 0 1px black;
+        icon-shadow: 0 1px black;
+        outline-color: rgba(238, 238, 236, 0.3);
+        background-color: #202526; }
+        .osd scale trough slider:hover {
+          color: white;
+          border-color: rgba(0, 0, 0, 0.7);
+          background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
+          background-clip: padding-box;
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+          text-shadow: 0 1px black;
+          icon-shadow: 0 1px black;
+          outline-color: rgba(238, 238, 236, 0.3); }
+        .osd scale trough slider:active {
+          color: white;
+          border-color: rgba(0, 0, 0, 0.7);
+          background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+          background-clip: padding-box;
+          box-shadow: none;
+          text-shadow: none;
+          icon-shadow: none;
+          outline-color: rgba(238, 238, 236, 0.3); }
+        .osd scale trough slider:backdrop {
+          color: #eeeeec;
+          border-color: rgba(0, 0, 0, 0.7);
+          background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
+          background-clip: padding-box;
+          box-shadow: none;
+          text-shadow: none;
+          icon-shadow: none; }
+    scale trough.highlight {
       background-image: linear-gradient(to bottom, #4a90d9 2px, #63a0de);
       border-color: #184472;
       box-shadow: 0 1px white; }
-      scale trough.highlight.vertical,
-      scale.scale-has-marks-above.scale-has-marks-below trough.highlight.vertical,
-      scale.vertical.scale-has-marks-above.scale-has-marks-below trough.highlight.vertical {
+      scale trough.highlight.vertical {
         background-image: linear-gradient(to right, #4a90d9 2px, #63a0de); }
-      scale trough.highlight:backdrop,
-      scale.scale-has-marks-above.scale-has-marks-below trough.highlight:backdrop,
-      scale.vertical.scale-has-marks-above.scale-has-marks-below trough.highlight:backdrop {
+      scale trough.highlight:backdrop {
         border-color: #4a90d9;
         background-color: #4a90d9;
         box-shadow: none; }
-    scale trough:insensitive, scale trough.vertical:insensitive,
-    scale.scale-has-marks-above.scale-has-marks-below trough:insensitive,
-    scale.scale-has-marks-above.scale-has-marks-below trough.vertical:insensitive,
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough:insensitive,
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough.vertical:insensitive {
+    scale trough:insensitive, scale trough.vertical:insensitive {
       border-color: #a1a1a1;
       background-image: none;
       background-color: #f4f4f4;
       box-shadow: 0 1px white; }
-    scale trough:backdrop,
-    scale.scale-has-marks-above.scale-has-marks-below trough:backdrop,
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop {
+    scale trough:backdrop {
       border-color: darkgray;
       background-color: #c7c7c7;
       box-shadow: none; }
-    scale trough:backdrop:insensitive, scale trough .highlight:backdrop:insensitive,
-    scale.scale-has-marks-above.scale-has-marks-below trough:backdrop:insensitive,
-    scale.scale-has-marks-above.scale-has-marks-below trough .highlight:backdrop:insensitive,
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop:insensitive,
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough .highlight:backdrop:insensitive {
+    scale trough:backdrop:insensitive, scale trough .highlight:backdrop:insensitive {
       border-color: darkgray;
       background-color: #f4f4f4; }
-    .osd scale trough, .osd
-    scale.scale-has-marks-above.scale-has-marks-below trough, .osd
-    scale.vertical.scale-has-marks-above.scale-has-marks-below trough {
+    .osd scale trough {
       border-color: rgba(0, 0, 0, 0.7);
       box-shadow: none;
       margin: 9px;
       background-color: rgba(0, 0, 0, 0.5);
       outline-color: rgba(238, 238, 236, 0.2);
       outline-offset: -8px; }
-      .osd scale trough.fine-tune, .osd
-      scale.scale-has-marks-above.scale-has-marks-below trough.fine-tune, .osd
-      scale.vertical.scale-has-marks-above.scale-has-marks-below trough.fine-tune {
+      .osd scale trough.fine-tune {
         margin: 7px; }
-      .osd scale trough.highlight, .osd
-      scale.scale-has-marks-above.scale-has-marks-below trough.highlight, .osd
-      scale.vertical.scale-has-marks-above.scale-has-marks-below trough.highlight {
+      .osd scale trough.highlight {
         background-image: none;
         background-color: #4a90d9; }
-      .osd scale trough:insensitive, .osd scale trough:backdrop:insensitive, .osd
-      scale.scale-has-marks-above.scale-has-marks-below trough:insensitive, .osd
-      scale.scale-has-marks-above.scale-has-marks-below trough:backdrop:insensitive, .osd
-      scale.vertical.scale-has-marks-above.scale-has-marks-below trough:insensitive, .osd
-      scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop:insensitive {
+      .osd scale trough:insensitive, .osd scale trough:backdrop:insensitive {
         border-color: transparent;
         background-color: transparent; }
-      .osd scale trough:backdrop, .osd
-      scale.scale-has-marks-above.scale-has-marks-below trough:backdrop, .osd
-      scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop {
+      .osd scale trough:backdrop {
         border-color: rgba(0, 0, 0, 0.7);
         background-image: none; }
-  row:selected scale, row:selected
-  scale.scale-has-marks-above.scale-has-marks-below, row:selected
-  scale.vertical.scale-has-marks-above.scale-has-marks-below {
+  row:selected scale {
     border-color: #184472;
     box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
-    row:selected scale:backdrop, row:selected
-    scale.scale-has-marks-above.scale-has-marks-below:backdrop, row:selected
-    scale.vertical.scale-has-marks-above.scale-has-marks-below:backdrop {
+    row:selected scale:backdrop {
       box-shadow: none; }
-    row:selected scale.highlight:backdrop, row:selected
-    scale.scale-has-marks-above.scale-has-marks-below.highlight:backdrop, row:selected
-    scale.vertical.scale-has-marks-above.scale-has-marks-below.highlight:backdrop {
+    row:selected scale.highlight:backdrop {
       border-color: #184472; }
-    row:selected scale:insensitive, row:selected scale.highlight:insensitive, row:selected
-    scale.scale-has-marks-above.scale-has-marks-below:insensitive, row:selected
-    scale.scale-has-marks-above.scale-has-marks-below.highlight:insensitive, row:selected
-    scale.vertical.scale-has-marks-above.scale-has-marks-below:insensitive, row:selected
-    scale.vertical.scale-has-marks-above.scale-has-marks-below.highlight:insensitive {
+    row:selected scale:insensitive, row:selected scale.highlight:insensitive {
       border-color: #4a90d9;
       box-shadow: none;
       background-color: #a5c8ec;
       background-image: none; }
-      row:selected scale:insensitive:backdrop, row:selected scale.highlight:insensitive:backdrop, row:selected
-      scale.scale-has-marks-above.scale-has-marks-below:insensitive:backdrop, row:selected
-      scale.scale-has-marks-above.scale-has-marks-below.highlight:insensitive:backdrop, row:selected
-      scale.vertical.scale-has-marks-above.scale-has-marks-below:insensitive:backdrop, row:selected
-      scale.vertical.scale-has-marks-above.scale-has-marks-below.highlight:insensitive:backdrop {
+      row:selected scale:insensitive:backdrop, row:selected scale.highlight:insensitive:backdrop {
         background-color: #a5c8ec; }
 
 scale marks {
   color: alpha(currentColor,0.5); }
 
-scale.scale-has-marks-below {
-  -GtkScale-slider-length: 20;
-  -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2; }
-  scale.scale-has-marks-below trough slider {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below.png"), url("assets/slider-horz-scale-has-marks-below@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.scale-has-marks-below trough slider:hover {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover.png"), url("assets/slider-horz-scale-has-marks-below-hover@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.scale-has-marks-below trough slider:active {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active.png"), url("assets/slider-horz-scale-has-marks-below-active@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.scale-has-marks-below trough slider:insensitive {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-insensitive@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.scale-has-marks-below trough slider:backdrop {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop.png"), url("assets/slider-horz-scale-has-marks-below-backdrop@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.scale-has-marks-below trough slider:backdrop:insensitive {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
+scale trough:first-child:not(:last-child) slider {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below.png"), url("assets/slider-horz-scale-has-marks-below@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale trough:first-child:not(:last-child) slider:hover {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover.png"), url("assets/slider-horz-scale-has-marks-below-hover@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale trough:first-child:not(:last-child) slider:active {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active.png"), url("assets/slider-horz-scale-has-marks-below-active@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale trough:first-child:not(:last-child) slider:insensitive {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-insensitive@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale trough:first-child:not(:last-child) slider:backdrop {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop.png"), url("assets/slider-horz-scale-has-marks-below-backdrop@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale trough:first-child:not(:last-child) slider:backdrop:insensitive {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
 
-scale.scale-has-marks-above {
-  -GtkScale-slider-length: 20;
-  -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2; }
-  scale.scale-has-marks-above trough slider {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above.png"), url("assets/slider-horz-scale-has-marks-above@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.scale-has-marks-above trough slider:hover {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover.png"), url("assets/slider-horz-scale-has-marks-above-hover@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.scale-has-marks-above trough slider:active {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active.png"), url("assets/slider-horz-scale-has-marks-above-active@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.scale-has-marks-above trough slider:insensitive {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-insensitive@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.scale-has-marks-above trough slider:backdrop {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop.png"), url("assets/slider-horz-scale-has-marks-above-backdrop@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.scale-has-marks-above trough slider:backdrop:insensitive {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
+scale trough:not(:first-child):last-child slider {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above.png"), url("assets/slider-horz-scale-has-marks-above@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale trough:not(:first-child):last-child slider:hover {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover.png"), url("assets/slider-horz-scale-has-marks-above-hover@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale trough:not(:first-child):last-child slider:active {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active.png"), url("assets/slider-horz-scale-has-marks-above-active@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale trough:not(:first-child):last-child slider:insensitive {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-insensitive@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale trough:not(:first-child):last-child slider:backdrop {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop.png"), url("assets/slider-horz-scale-has-marks-above-backdrop@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale trough:not(:first-child):last-child slider:backdrop:insensitive {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
 
-scale.vertical.scale-has-marks-below {
-  -GtkScale-slider-length: 20;
-  -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2; }
-  scale.vertical.scale-has-marks-below trough slider {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below.png"), url("assets/slider-vert-scale-has-marks-below@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.vertical.scale-has-marks-below trough slider:hover {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover.png"), url("assets/slider-vert-scale-has-marks-below-hover@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.vertical.scale-has-marks-below trough slider:active {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active.png"), url("assets/slider-vert-scale-has-marks-below-active@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.vertical.scale-has-marks-below trough slider:insensitive {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-insensitive@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.vertical.scale-has-marks-below trough slider:backdrop {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop.png"), url("assets/slider-vert-scale-has-marks-below-backdrop@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.vertical.scale-has-marks-below trough slider:backdrop:insensitive {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
+scale.vertical trough:first-child:not(:last-child) slider {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below.png"), url("assets/slider-vert-scale-has-marks-below@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale.vertical trough:first-child:not(:last-child) slider:hover {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover.png"), url("assets/slider-vert-scale-has-marks-below-hover@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale.vertical trough:first-child:not(:last-child) slider:active {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active.png"), url("assets/slider-vert-scale-has-marks-below-active@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale.vertical trough:first-child:not(:last-child) slider:insensitive {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-insensitive@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale.vertical trough:first-child:not(:last-child) slider:backdrop {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop.png"), url("assets/slider-vert-scale-has-marks-below-backdrop@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale.vertical trough:first-child:not(:last-child) slider:backdrop:insensitive {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
 
-scale.vertical.scale-has-marks-above {
-  -GtkScale-slider-length: 20;
-  -GtkRange-slider-width: 24;
-  -GtkRange-trough-border: 2; }
-  scale.vertical.scale-has-marks-above trough slider {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above.png"), url("assets/slider-vert-scale-has-marks-above@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.vertical.scale-has-marks-above trough slider:hover {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover.png"), url("assets/slider-vert-scale-has-marks-above-hover@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.vertical.scale-has-marks-above trough slider:active {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active.png"), url("assets/slider-vert-scale-has-marks-above-active@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.vertical.scale-has-marks-above trough slider:insensitive {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-insensitive@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.vertical.scale-has-marks-above trough slider:backdrop {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop.png"), url("assets/slider-vert-scale-has-marks-above-backdrop@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
-  scale.vertical.scale-has-marks-above trough slider:backdrop:insensitive {
-    border-style: none;
-    border-radius: 0;
-    background-color: transparent;
-    background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png"));
-    background-repeat: no-repeat;
-    background-position: center;
-    box-shadow: none; }
+scale.vertical trough:not(:first-child):last-child slider {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above.png"), url("assets/slider-vert-scale-has-marks-above@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale.vertical trough:not(:first-child):last-child slider:hover {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover.png"), url("assets/slider-vert-scale-has-marks-above-hover@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale.vertical trough:not(:first-child):last-child slider:active {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active.png"), url("assets/slider-vert-scale-has-marks-above-active@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale.vertical trough:not(:first-child):last-child slider:insensitive {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-insensitive@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale.vertical trough:not(:first-child):last-child slider:backdrop {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop.png"), url("assets/slider-vert-scale-has-marks-above-backdrop@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
+scale.vertical trough:not(:first-child):last-child slider:backdrop:insensitive {
+  border-style: none;
+  border-radius: 0;
+  background-color: transparent;
+  background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png"));
+  background-repeat: no-repeat;
+  background-position: center;
+  box-shadow: none; }
 
-scale.scale-has-marks-above trough {
-  margin: 14px 10px 10px; }
-scale.fine-tune.scale-has-marks-above trough {
-  margin: 12px 8px 8px; }
+scale trough:not(:first-child):last-child {
+  margin: 14px 10px 10px 10px; }
 
-scale.scale-has-marks-below trough {
-  margin: 10px 10px 14px; }
-scale.fine-tune.scale-has-marks-below trough {
-  margin: 8px 8px 12px; }
+scale trough:first-child:not(:last-child) {
+  margin: 10px 10px 14px 10px; }
 
-scale.vertical.scale-has-marks-above trough {
+scale.vertical trough:not(:first-child):last-child {
   margin: 10px 10px 10px 14px; }
-scale.fine-tune.vertical.scale-has-marks-above trough {
-  margin: 8px 8px 8px 12px; }
 
-scale.vertical.scale-has-marks-below trough {
+scale.vertical trough:first-child:not(:last-child) {
   margin: 10px 14px 10px 10px; }
-scale.fine-tune.vertical.scale-has-marks-below trough {
-  margin: 8px 12px 8px 8px; }
+
+scale.fine-tune trough:not(:first-child):last-child {
+  margin: 12px  8px  8px  8px; }
+
+scale.fine-tune trough:first-child:not(:last-child) {
+  margin: 8px  8px 12px  8px; }
+
+scale.vertical.fine-tune trough:not(:first-child):last-child {
+  margin: 8px  8px  8px 12px; }
+
+scale.vertical.fine-tune trough:first-child:not(:last-child) {
+  margin: 8px 12px  8px  8px; }
 
 /*****************
  * Progress bars *
@@ -4706,24 +4630,24 @@ headerbar.selection-mode button.titlebutton,
 textview text:selected,
 .view:selected,
 calendar:selected, label:selected, label:selected:focus, label:selected:hover, .grid-child:selected, entry:selected, spinbutton:selected, entry:selected:focus, spinbutton:selected:focus, modelbutton.flat:selected,
-.menuitem.button.flat:selected, row:selected, .sidebar:selected {
+.menuitem.button.flat:selected, row:selected, .sidebar :selected {
   background-color: #4a90d9;
   color: #ffffff;
   outline-color: rgba(255, 255, 255, 0.3); }
   textview text:insensitive:selected,
   .view:insensitive:selected,
   calendar:insensitive:selected, label:insensitive:selected, .grid-child:insensitive:selected, entry:insensitive:selected, spinbutton:insensitive:selected, modelbutton.flat:insensitive:selected,
-  .menuitem.button.flat:insensitive:selected, row:insensitive:selected, .sidebar:insensitive:selected, placessidebar row:selected:insensitive label {
+  .menuitem.button.flat:insensitive:selected, row:insensitive:selected, .sidebar :insensitive:selected, placessidebar row:selected:insensitive label {
     color: #a5c8ec; }
   textview text:backdrop:selected,
   .view:backdrop:selected,
   calendar:backdrop:selected, label:backdrop:selected, .grid-child:backdrop:selected, entry:backdrop:selected, spinbutton:backdrop:selected, modelbutton.flat:backdrop:selected,
-  .menuitem.button.flat:backdrop:selected, row:backdrop:selected, .sidebar:backdrop:selected {
+  .menuitem.button.flat:backdrop:selected, row:backdrop:selected, .sidebar :backdrop:selected {
     color: #ffffff; }
     textview text:backdrop:insensitive:selected,
     .view:backdrop:insensitive:selected,
     calendar:backdrop:insensitive:selected, label:backdrop:insensitive:selected, .grid-child:backdrop:insensitive:selected, entry:backdrop:insensitive:selected, spinbutton:backdrop:insensitive:selected, modelbutton.flat:backdrop:insensitive:selected,
-    .menuitem.button.flat:backdrop:insensitive:selected, row:backdrop:insensitive:selected, .sidebar:backdrop:insensitive:selected, placessidebar row:selected:insensitive label:backdrop, placessidebar row:selected:backdrop:insensitive label {
+    .menuitem.button.flat:backdrop:insensitive:selected, row:backdrop:insensitive:selected, .sidebar :backdrop:insensitive:selected, placessidebar row:selected:insensitive label:backdrop, placessidebar row:selected:backdrop:insensitive label {
       color: #80b1e4; }
 
 .monospace {
-- 
2.30.2